merge trunk
authorKenichi Handa <handa@m17n.org>
Sun, 11 Dec 2011 12:11:01 +0000 (21:11 +0900)
committerKenichi Handa <handa@m17n.org>
Sun, 11 Dec 2011 12:11:01 +0000 (21:11 +0900)
commitfbb77b4075776f887feb39148866ac11d42bfd01
tree0cf4b0b898a6c919f7c21f445454822ad63f240d
parent6fbb7eade37af827073713c930b5608b309724e0
parent46ca381149e1df47d95779aafe4532a70632c143
merge trunk